update to gfdl 20210914 #76
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ncar-2021-04-21 Merging the main candidate from GFDL 2021-03-26
…nthreads_nuopc Add isPresent and isSet when retrieving nthreads
These arrays were not being deallocated which was causing a memory leak problem.
De-allocate Kd_bkgnd and Kv_bkgnd
This commit fixes misplaced parentheses in the tridiagonal solvers used in subroutines tracer_vertdiff_Eulerian and tracer_vertdiff. This bug has been reported in https://github.com/NOAA-GFDL/MOM6/issues/1415 This commit also changes the mask condition used in these subroutines.
This commit adds a new module (MOM_CFC_cap) that can used to simulate chlorofluorocarbons (CFCs) tracers. It also includes the modifications needed to 1) allocate arrays in the fluxes and surface types, and 2) activate the MOM_CFC_cap module via NUOPC cap.
…mentation * Implements a module to simulate CFCs via NUOPC cap
Fix NUOPC import of fields required for the new CFC module
The export of ice fraction was previously added for the newly added CFC module.
In a previous commit, the expression tr(i,j,1) = (b1(i)*h_tr)*tr(i,j,1) + sfc_src(i,j) was change to tr(i,j,1) = b1(i)*(h_tr*tr(i,j,1) + sfc_src(i,j)) in 4 lines. This changed the order in which b1(i)*h_tr*tr(i,j,1) is evaluated, even if sfc_src(i,j) is 0.0. Because the CESM configurations use the passive tracer tridiagonal solver for T and S, the modification above changed answers in these configurations. To recover previous answers the expression must be tr(i,j,1) = (b1(i)*h_tr)*tr(i,j,1) + b1(i)*sfc_src(i,j)
Merge main from GFDL (210723)
…change_in_CFC_PR * Recover answer change from CFC PR
…solving conflicts
remove unused index bounds, and fix sum_h2 loop.
Update MOM_oda_incupd.F90
…0210727 IAU candidate 20210727
…uted and applied: (1) When available, pass the enhancement factor received from WW3. Otherwise, let CVmix compute the enhancement factor. (2) Instead of explicitly multiplying diffusivities and viscosities with the enhancement factor, let CVMix handle enhancement internally.
correct scale argument in get_param and chksum calls add dimension scaling terms to some expressions add some chksum calls
remove unused and unneeded local variables correct unit-related comments rework CFC_cap_fluxes to better align with Orr et al., GMD, 2017
…tionality of prescribed constant enhancement.
Introduce the legacy CESM WW3 coupling option (VR12-MA)
…fixes dimension rescaling fixes and CFC cleanup
…passage of lamult enhancement factor
Pr1491 fixes
…candidate-2021-08-30 Dev ncar main candidate 2021 08 31
…20210914 merge GFDL main 20210914 commit (hash # c09e199)
14 tasks
DeniseWorthen
approved these changes
Sep 20, 2021
| @@ -650,6 +651,10 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |||
| ocean_public%is_ocean_pe = .true. | |||
| call ocean_model_init(ocean_public, ocean_state, time0, time_start, input_restart_file=trim(restartfiles)) | |||
|
|
|||
| ! GMM, this call is not needed for NCAR. Check with EMC. | |||
| ! If this can be deleted, perhaps we should also delete ocean_model_flux_init | |||
| call ocean_model_flux_init(ocean_state) | |||
There was a problem hiding this comment.
@jiandewang Did you check whether this was needed?
There was a problem hiding this comment.
@DeniseWorthen no I didn't test that.
there are some remaining issue (CFC related) in this PR, GFDL and NCAR will address them in the next round.
JessicaMeixner-NOAA
approved these changes
Sep 21, 2021
jiandewang
pushed a commit
to jiandewang/MOM6
that referenced
this pull request
May 17, 2022
Note that most of these commits are from previously squashed pull requests, and this PR is restoring them. - 6360dbb Merge branch 'main' into main_to_dev - bac8031 Merge pull request mom-ocean#1566 from jiandewang/EMC-FMS-mixed-mode-20220411 - e532d86 Merge pull request NOAA-EMC#88 from marshallward/missing_attrib_with_class_bugfix - d380f1d An alternate fix to class(*) issues with FMS 2022-01 - 8ecf333 Merge pull request NOAA-EMC#87 from jiandewang/feature/update-to-main-20220317 - ba37f94 Merge remote-tracking branch 'FSU/main' into feature/update-to-main-20220317 this is corresponding to MOM6 main 20220317 commit (hash # 399a7db) - 44313d9 Merge pull request NOAA-EMC#85 from jiandewang/feature/update-to-main-20220217 - 966707f Merge remote-tracking branch 'GFDL/main' into feature/update-to-main-20220217 this is corresponding to MOM6 main branch 20220217 commit (hash # 6f6d4d6), which originally based on GFDL-candidate-20220129 - 32c0e1e Merge pull request NOAA-EMC#81 from jiandewang/feature/update-to-main-20211220 - 9642b1d delete external/OCEAN_stochastic_phyiscs directory as Phil re-coded in external/stochastic_physics directory - e7c9ada solve minor conflict in mom_cap.F90 mom_ocean_model_nuopc.F90 and MOM_energetic_PBL.F90, add two new files: src/parameterizations/stochastic/MOM_stochastics.F90 and config_src/external/stochastic_physics/stochastic_physics.F90 - 90d5961 Merge pull request NOAA-EMC#78 from jiandewang/feature/update-to-GFDL-20211019 - fd02017 Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20211019 - 36f17eb Merge pull request NOAA-EMC#72 from pjpegion/ocn_stoch_july2021 - a9a957e return a more accurate error message in MOM_stochasics - 56bb41e Merge branch 'ocn_stoch_july2021' of https://github.com/pjpegion/MOM6 into ocn_stoch_july2021 - ca2ae1c update to dev/emc - 14ca4a1 Merge pull request NOAA-EMC#76 from jiandewang/feature/update-to-GFDL-20210914 - 29016c2 Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210914 merge GFDL main 20210914 commit (hash # c09e199) - a8577df Merge branch 'NOAA-EMC:dev/emc' into ocn_stoch_july2021 - f8a8e4c update to gfdl 20210806 (NOAA-EMC#74) - 16e6af0 update to dev/emc - 237a510 add comments - 1b4273d revert logic wrt increments - 5b2040e add logic to remove incrments from restart if outside IAU window - c5f2b72 add write_stoch_restart_ocn to MOM_stochastics - bdf2dc7 doxygen cleanup - 8bc4acc move stochastics to external directory - a3fa3a1 Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch_july2021 - e4bc007 stochastic physics re-write - 202cbd4 update to dev/emc - 61717ee Merge remote-tracking branch 'origin/dev/emc' into ocn_stoch - 565e0bb remove debug statements - a4c0411 Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch - 689a73f remove PE_here from mom_ocean_model_nuopc.F90 - 8afe969 clean up of mom_ocean_model_nuopc.F90 - 25ed4fc revert MOM_domains.F90 - b8d9888 place stochastic array in fluxes container and make SPPT specific arrays allocatable - d984a7e remove stochastics container - eb88219 clean up of code for MOM6 coding standards - 6e3ea1b correct coupled_driver/ocean_model_MOM.F90 and other cleanup - 0b99c1f make stochastics optional - 85023f8 Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch - 80f9f44 clean up MOM_domains - 5443f8e remove blank link in MOM_diagnostics - 1727d9a re-write of stochastic code to remove CPP directives - 600ebf9 Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch - 6bb9d0b fix non stochastic ePBL calculation - 1d7ffa3 clean up code - 040e1f1 Merge pull request #13 from NOAA-EMC/dev/emc - 2cba995 Merge branch 'dev/emc' into ocn_stoch - 1dc0f4f Merge remote-tracking branch 'upstream/dev/emc' into dev/emc - 4bd9b9e clean up debug statements - 25ed5ef additions for stochy restarts - a2a374b add stochy_restart writing to mom_cap - 0c15f4c Update MOM_diabatic_driver.F90 - 167a62e Merge pull request #12 from pjpegion/dev/emc - bd477a9 Update MOM_diabatic_driver.F90 - 7212400 Update MOM_diabatic_driver.F90 - 7de295c cleanup of code and enhancement of ePBL perts - cd06356 Merge pull request #11 from NOAA-EMC/dev/emc - 9896d61 Merge pull request #9 from pjpegion/dev/emc_merge - 0a62737 Merge branch 'ocn_stoch' into dev/emc_merge - 3cad1ba Merge pull request #8 from NOAA-EMC/dev/emc - c2aa2a8 updates from dev/emc - 182ef34 additions for stochastic physics and ePBL perts - 671c714 Merge pull request #1 from NOAA-EMC/dev/emc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update MOM6 to GFDL main branch 20210914 commit (see detail at iuuse #75 )